Some bug fixes after the migration and more features passing