Minor fixes - no implementation changes required.