updates for gav and gwt - trying to resolve issues