Adds some needed fixes