Some post merge fixes.