Fixed broken APIs