Did some fixy stuff