Bug fixes

Fixing issues with cheese detection