Fixed API issues