MERGE more eng2d blit fixes