Last changes, getting ready for conversion to Go