Fix other errors