Fixed some missed stuff to utilize resource repo.