Some ref changes and updates