some fixes needed after merging master