Tweaks for local testing, all looking fine for deploy