Integration bugs with new resource registry