Hopefully fix some things