SDL fixes