Fixed errors in my APIs as requested by Andi