Some fixes again.