cleanup on JIRAs

fixing a few easy JIRAs