Solve some compiler errors.
merge issues