Base: Minor touchup