A few quick improvements