Removing FIXME as it was fixed!
Code cleanup fixes from Shane/Doug.