I had the same door ajar light problem. I added a couple of washers to both bolts on the hatch latch. Didn't work. Added a couple more washers, going right to the limit of how many washers you can have and still have enough exposed thread on the bolts for them to reattach. And it worked!
So I guess my tip would that washers are not all the same thickness. You want to boost your latch by about 3/16" to 1/4".