[Minor] Fixes on top of #1679

Minor fixes on top of #1679.
nit: / (1024 * 1024) instead ?