Fixing references for production