A few code changes