Improved build after post on Caliper