fixes after merging master