gateway fixes & evolution