Missed encoding improvements