Fixes, preparing for metaboxes.