Fixes to clean up master version for live deploy