Additional changes to prep for meta boxes.