First tweaks to categories