Slight tweaks in preparation for Linux support again