Fix authorization site inheritance, eliminate NULLs