Lot of small fixes for RESTful migration