Fix warning and Update routering