Non breaking code improvements

There are some non breaking code improvements.