Early June fixes