[0.0.20m] Added some minor changes