Small fixes to improve portability.