Attempt to fix some of the problems