Base: Small bug fixes