Fix broken proof, import shortcuts from common file