Fixing everything, hopefully