Updates for R# 8.1