A few more bugs down...