More buid fixes