Fix compile errors and repo update