Sane fixes