fixes for current AS