Fix some stuffs for the front office