Logs and fixes