Some small crbuild fixes