Fix other stuff