More fixes to definition editor