Small fixes in #213, #214 and #218