diff --git a/app/app.go b/app/app.go
index efe9e3cf..1cc799d8 100644
--- a/app/app.go
+++ b/app/app.go
@@ -222,9 +222,11 @@ func NewApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
 
 	app.mm.SetOrderEndBlockers(crisis.ModuleName, gov.ModuleName, staking.ModuleName)
 
-	// genutils must occur after staking so that pools are properly
+	// Note: genutils must occur after staking so that pools are properly
 	// initialized with tokens from genesis accounts.
-	// TODO should auth be first?
+	//
+	// Note: Changing the order of the auth module and modules that use module accounts
+	// results in subtle changes to the way accounts are loaded from genesis.
 	app.mm.SetOrderInitGenesis(
 		auth.ModuleName, distr.ModuleName,
 		staking.ModuleName, bank.ModuleName, slashing.ModuleName,
diff --git a/cli_test/cli_test.go b/cli_test/cli_test.go
index 9e7df17d..e559e6b7 100644
--- a/cli_test/cli_test.go
+++ b/cli_test/cli_test.go
@@ -281,7 +281,7 @@ func TestGaiaCLISend(t *testing.T) {
 	f.Cleanup()
 }
 
-// TODO needed? not in gaia tests
+// Note: this was removed from gaia due to update in sdk PR#4062 but is now working
 func TestGaiaCLIConfirmTx(t *testing.T) {
 	t.Parallel()
 	f := InitFixtures(t)
@@ -1307,9 +1307,7 @@ func TestGaiadAddGenesisAccount(t *testing.T) {
 
 	cdc := app.MakeCodec()
 
-	// TODO maybe replace once sdk updated
-	var authGenState auth.GenesisState
-	cdc.MustUnmarshalJSON(genesisState[auth.ModuleName], &authGenState)
+	authGenState := auth.GetGenesisStateFromAppState(cdc, genesisState)
 	accounts := authGenState.Accounts
 
 	require.Equal(t, accounts[0].GetAddress(), f.KeyAddress(keyFoo))