Add some of ComputerNerd's fixes.