Fixes according to comments from Jorge Puente-Sarrín. #385