Some fixes, again