A few quick fixes