Minor changes to be more portable
Merge local changes with remote changes