Some fixes, some not yet