Fixes around options and categories