Minor fixes should not affect operation