Corrected non-Windows bugs added by previous update.