Fixing up some inconsistencies and updating git submodules