More 1.2 work - now fully compliant