Fixes & safe-rem