Changes as requested by @Bertram25 and @oyvindln