fixed derived files when doing full deploy and other minor fixes