Fix introduced bugs