bring forward some things I forgot from 0.4.25 to 0.4.27.2