Fixed problems seen by @Bertram25