Minior code changes