Various fixes
Git alias tweaks