Fixed More API Issues