Fixes to autopromote functionality