fixes as per lwjohnst86 + QuLogic
fixes as per lwjohnst86 + QuLogic

linamnt/studyGroup,mbonsma/studyGroup,lwjohnst86/studyGroup,QuLogic/studyGroup,lwjohnst86/studyGroup,mbonsma/studyGroup,lwjohnst86/studyGroup,linamnt/studyGroup,mbonsma/studyGroup,mbonsma/studyGroup,QuLogic/studyGroup,lwjohnst86/studyGroup,linamnt/studyGroup,linamnt/studyGroup,QuLogic/studyGroup,linamnt/studyGroup,linamnt/studyGroup,lwjohnst86/studyGroup,QuLogic/studyGroup,lwjohnst86/studyGroup,mbonsma/studyGroup,mbonsma/studyGroup,QuLogic/studyGroup,QuLogic/studyGroup