More fixes according to Puls’s suggestions.