Fixed nits addressed by KHuey