Corrections based on CI Hound and @revett's feedback