Fixes on REST API