Fix minor issues thanks to Martin Brümmer