Minor changes on FE&BE