Remove conflicts with minimal_base