small fixes in gateway model and specs