More minor fixes around skins, and dictionary