More SDL fixes.