Missing fixes after merging master