Assorted fixes related to the new rxjava RC.