More mine change fixes