Some fixes regarding disposables
update to latest common components