fixup stuff to master version