Comply with the now more strict communication spec and a small bug fix