Merged develop into warning fixes
Fixed the rest of the warnings from GLPK