Minor tweaks and a fix for subEl types.