[FIX] Core: option handling