Fixing build errors and git problems.