Enoding tweaks