Fixing some things