[BUG-FIX] Fix the bugs now that linux is working again