Fixes on rem