Mostly possible bug ("feature") fixes.