Fixing more shit