Base: Minor bug fix and performance improvements