Base: Minor clean up