Final patches I hope