Changes in few forms for bug fixes and consistency

Signed-off-by: Arnab Naha <superarnab@gmail.com>