Some resource generation fixes.