Apply fixes suggested by Nouran