Logging and messaging improvements