Fixes on rem
Dep upd