Fix initial compile errors