Fixing some more things