Some fixes to d11n