Fix Logging, etc.