A few more customizations