Fixed a few style-guide errors after merge with develop