Type fixes for Linux