Corrections in slave api, small changes in master api