Fix problems indicated by Braulio