Numerous little fixes.