Few customization improvements and fixes