Additional standards improvements.