Fixing Rupert's bugs.