Fix references
More safeties