More bubble fixes