Partial fix on Rest methods