Added some quick workarounds for non-Linux systems