some fixes for editing