CS fixes for all types