Logging and update fixes