Fixes findbugs issues for Restaurant side