Fixes for resources