Resource Fixes