Some small fixes

To get it running in production for testing.