Improve build optimisation for core/observe