Some fixes, I think