MP1-4554: Fixing logs and dispose calls.