fixes for custom options