Base: Minor updates