Fixes suggested by Érico