BZ894081 Various micro-fixes