Minor fixes after code inspection.