Project fixes for distribution