Some fixed in shell