Fixing some more stuff.