rsimon Minor fixes