Fix Import Errors in Staging

- Couple 2, 3 things were misaligned, causing staging to be sad.