Minor fixes to get working in production