Various fixes for group editor