Fix remaining 'compare' calls

Fixes #264