Few small code changes