Fixing Thomas's bugs.