Fix API Breakage