Fix minor bugs on customization