Minor fixes discovered after initial commit