Minor fixes and nitpicks