Coapblip fixes