Category: fixes