Some fixes

As usual.