Properly fix things