Added some rectifications