#86 Fixes for linux