Some resource location fixes and other small changes.