Final Fixes before playday