Fixing Shaun's bugs.