Trivial code changes