Another batch of fixes to specific types