URBNG-448: Made some minor changes.