Restaurant side findbugs fixes