Post launch bugfixes

Fixing 1083250 and 1083274