Fixing references
Removing resolved TODO