Fixing Steve's bugs.