Address some of JC's review comments