Several fixes (merge issues)