Some small changes after testing