Adds some possible fixes