Fixing standards and 5.3 compatability