[dev] A few small fixes. This commit is targeted for the 0.916 release.