Several fixes for WaResources
Merge branch 'storyrobin' of https://github.com/ging/vish into storyrobin