Fixing some more things.