Fix other little errors