Fix other code