Handle some things better