Fixes new bugs.