16 june fixes