few fixes for REST changes