consolidation for simple and misc fixes