Small tweaks for production

These small tweaks make production not error on load