merge, fixes for prev merge