Fixed minor gateway errors