Fix References compliancy