Fixed nits left over after merge with develop