Horay, more fixes