Some minor changes for stardust support.
3 files changed