Fixing production issues (DEV)