Minor updates to fix pre-parsed element usage