Fixed More API Issues
Merge branch 'pushalot'