[#879] More fix-ups