Applied reviev fixes
refs #547