Minor GitPad patches