Some tweaks for RESTfullnes