fixes as suggested by Marco