fix little pull-request issues