GRILL-619 - Fixed some more review comments