Merge Fix + small fixes