HurrDurr fixes