Work on resource interfaces and fixes.