ResourceBase fixes