Fix some new bugs