corrections in source management logic