Fix some bugs
Update to latest cookbook