Project fixes for deployment