Some fixed for the prototype