Fixing a couple non-Windows bugs