moar fix stuffs