Honor some additional notices and fix logging headers