Type fixes