Fix: A couple dust-related fixes