Fix find bugs errors

Relates to #26