Fixing more development vs. production stuff