Fixed Rest bugs