compiler warning and consts

For some reason VIM saved the whole file so the diff is wrong, if you know how I can re-push without the first commit, that'd be great.