Fix new bugs