Couple fixes for rendering groups in BS2