more disabled fixes