More special case commits