Fix introduced bugs.