More small customizations