Finish fixing SDL;