A few more resource tweaks