Lost on Cow Island: Minor bugfixes

Minor bugfixes