Fixing more build errors.