Minor tweaks to fix object comparisons with CLAC