Slight tweaks to crosstab