Some fixes. Here we go again.