Uncommitted tweaks from linux machine.