Merge remote-tracking branch 'pochu/misc-fixes'