Working through bugs from that commit