More Berapa compile fixes