API-115 Fixed errors