Fixing some more stuff