Bugfixes & Fixes for linux build