Correctness fix, some cleanup
Fix stderr -> logger logic