A couple more bugs