Multiple fixes as per emails