Category Error Fixes