Minor improvements using base functions