Trying to fix fuckups