Clean up generated stuff and fixed generating issues