Pin gateway fixes