More spark fixes.