Fixed the last few references
Couple hiding out