standards fixes