Couple fixes to ungit integration