Completed small changes