Yet more Berapa compile fixes