Minor fixes to resource listing
merging local from master