Minor changes for portability