Minor category improvements