More Berapa Linux compile fixes