Fix for Linux
Changes for linux