Small fixes as asked by @Bertram25