Fixes in swagger core lib