Updates RxJava, fixes scope