Base: Minor bug fixes