Very minor fixes and cleaning