Base: More small bug fixes