Fixing Nate's broken things