Re-including references
More fixings