OCD Fixes for final-configs.sh