fixes as required