Post refactor resource fixes.
Post refactor code fixes.