Resource fixes
Tests pass