Fixes. Damn I suck at good commit messages