SD Drunkards fixes