Adjust to new version of rxjava