Fix stuff more