updates to restore R15 compatibility