Ah, yeah, flattening can get wonky. I tend to save as a png without first flattening, then work from the png so I can keep the layers separate in case I need to fix something later. Makes a lot of files, but those can be cleaned up when you're done.