Some fixes, and disable test