Fix some usage of non-standard types for portability