fixes according to latest changes in YAS project