Fix some stuff broken in merge