More has many fixes