Fixing some things up