Included fixes suggested by Panos