Fix bugs and add utils