More coding changes