some fixes for ID-237