remove package name stutter, fix two gitfix problems