Improve portability