Fix various no-* options