Fixing Florian's bugs.