Minor aesthetic fixeds