Various fixes (enc 20cbc2a f0f41a4 696eca5).