Fix some 'tyops', fix no+any