Fix a bunch of kindlegen warnings