CG13 Retreat sessions

Few bug fixes made during the #CGRT13.