Various Fixes

TODO: resolve numeric name keys that become int