Fixing categories stuff