Categories and types fixed.