Apply selected improvements from sterraf's corrections

Co-authored-by: Sebastian Nagel <[email protected]>
Co-authored-by: Pedro Sánchez Terraf <[email protected]>

Author: 3 people