Fix some things up