A couple of additional smaller fixes.