Fixes for resource module