Blame @jose-vm and @InusualZ for these bugs