Make the bp api slightly saner