src update according to prev fixes