Fixes of custom options