Some more customizations that I was missing