fixes after merging master back in