Minor Encoder improvements