Checkpoint - build broken & need wrappers for ambiguous method calls