Even more bugs