Final sweep to fix post type hardcoding