few changes for linux support