Category: Fixes and repair