More tweaks to get native logging working