Fixes findbugs issues for restaurant side