fixes for cs:partial