Susy fixes