Minor fixes based on pull comments