Fixes for COOK-3853

1. https://tickets.opscode.com/browse/COOK-3853