Clean and Fix Govs

Cherry-picking is hard work *phew*