June fixes