URBNG-208: Made some minor changes.