Flatworld: Minor bugfixes

Minor bugfixes