fixes from code review and comments at http://tickets.opscode.com/browse/COOK-2503