Small fixes according to robweb's review