Fix disable option and components