Small changes for Mac-to-Windows compatibility