Corrections to logging throughout the app