Minor RMI440 edits for testing