Last few changes to get it working in production