cleaning up some build errors.