Misc updates for migrating to linux