fixes for rest services