Project fixes for beta7