Merge pull request #1932 from zoddicus/anotherSemiColonFix

Fix config issues and revert previous fixes for semi-colon issues