Fixed R# errors