FIX: Linux fixes