Sorry, spotted a couple more bugs