Fix few methods