1619 | Subhas | Minor fixes