Fixing some other small things