fixes all over the place