Cleanup, fix some build warnings