Base: Minor improvements