These are fixed in #567