Clean up manifest and controls bug