fixes as per issues